GtkBuildable: Fix the type of the user_data in GtkBuildable.custom_tag_end

The previous type was a pointer to a pointer, which seems to be a copy-paste
error from GtkBuildable.custom_tag_start which is an out parameter. It was
always cast in use so this is an API break, but not an ABI one.

diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index 0be820373a3b2c81c5e6b3db4b9090da1d14ab85..cb699e559445172cf947bf755f460a5bb5e948ee 100644 (file)
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -256,7 +256,7 @@ gtk_buildable_custom_tag_start (GtkBuildable  *buildable,
  * @builder: #GtkBuilder used to construct this object
  * @child: (allow-none): child object or %NULL for non-child tags
  * @tagname: name of tag
- * @data: (type gpointer): user data that will be passed in to parser functions
+ * @data: user data that will be passed in to parser functions
  *
  * This is called at the end of each custom element handled by 
  * the buildable.
@@ -266,7 +266,7 @@ gtk_buildable_custom_tag_end (GtkBuildable  *buildable,
                               GtkBuilder    *builder,
                               GObject       *child,
                               const gchar   *tagname,
-                              gpointer      *data)
+                              gpointer       data)
 {
   GtkBuildableIface *iface;
 

diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 911dfe32c700c46ddef341a2ea5231b8bf381ed7..ba899fa1f80f9f710a911209f8249421168e716b 100644 (file)
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -115,7 +115,7 @@ struct _GtkBuildableIface
                                            GtkBuilder    *builder,
                                            GObject       *child,
                                            const gchar   *tagname,
-                                           gpointer      *data);
+                                           gpointer       data);
   void          (* custom_finished)        (GtkBuildable  *buildable,
                                            GtkBuilder    *builder,
                                            GObject       *child,
@@ -164,7 +164,7 @@ void      gtk_buildable_custom_tag_end         (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                GObject             *child,
                                                const gchar         *tagname,
-                                               gpointer            *data);
+                                               gpointer             data);
 GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_custom_finished        (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,

diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index bccaa06efa39794fcb41732e487589f6b18e4f22..3fc37a3dac2d7a3fbf5351e74c814afbf0469e56 100644 (file)
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -468,7 +468,7 @@ static void      gtk_cell_area_buildable_custom_tag_end      (GtkBuildable
                                                               GtkBuilder            *builder,
                                                               GObject               *child,
                                                               const gchar           *tagname,
-                                                              gpointer              *data);
+                                                              gpointer               data);
 
 /* Used in foreach loop to check if a child renderer is present */
 typedef struct {
@@ -1575,7 +1575,7 @@ gtk_cell_area_buildable_custom_tag_end (GtkBuildable *buildable,
                                         GtkBuilder   *builder,
                                         GObject      *child,
                                         const gchar  *tagname,
-                                        gpointer     *data)
+                                        gpointer      data)
 {
   /* Just ignore the boolean return from here */
   _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index ae52674ac321bc5fc92e2e19dc0a94a6cdabfc99..6310cf78a9e2c3a516850e22db32edb0afb04a4f 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -93,7 +93,7 @@ static void       gtk_cell_view_buildable_custom_tag_end       (GtkBuildable
                                                                GtkBuilder            *builder,
                                                                GObject               *child,
                                                                const gchar           *tagname,
-                                                               gpointer              *data);
+                                                               gpointer               data);
 
 static GtkSizeRequestMode gtk_cell_view_get_request_mode       (GtkWidget             *widget);
 static void gtk_cell_view_measure (GtkWidget      *widget,
@@ -761,7 +761,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
                                        GtkBuilder   *builder,
                                        GObject      *child,
                                        const gchar  *tagname,
-                                       gpointer     *data)
+                                       gpointer      data)
 {
   if (_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
                                                 data))

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 792d2ebb28c2695ce577b3c5181097b13c69b539..553b9498ad3907fe7114e2a5008962930a8a1744 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -320,7 +320,7 @@ static void     gtk_combo_box_buildable_custom_tag_end       (GtkBuildable  *bui
                                                               GtkBuilder    *builder,
                                                               GObject       *child,
                                                               const gchar   *tagname,
-                                                              gpointer      *data);
+                                                              gpointer       data);
 static GObject *gtk_combo_box_buildable_get_internal_child   (GtkBuildable *buildable,
                                                               GtkBuilder   *builder,
                                                               const gchar  *childname);
@@ -3072,7 +3072,7 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
                                         GtkBuilder   *builder,
                                         GObject      *child,
                                         const gchar  *tagname,
-                                        gpointer     *data)
+                                        gpointer      data)
 {
   if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data))
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname, data);

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index ed83b036e6547542614d8212901056df56767a10..7bb95246582700c603eb80ba926123097e1566c1 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -179,7 +179,7 @@ static void    gtk_container_buildable_custom_tag_end (GtkBuildable *buildable,
                                                        GtkBuilder   *builder,
                                                        GObject      *child,
                                                        const gchar  *tagname,
-                                                       gpointer     *data);
+                                                       gpointer      data);
 
 /* --- variables --- */
 static GQuark                vadjustment_key_id;
@@ -604,7 +604,7 @@ gtk_container_buildable_custom_tag_end (GtkBuildable *buildable,
                                         GtkBuilder   *builder,
                                         GObject      *child,
                                         const gchar  *tagname,
-                                        gpointer     *parser_data)
+                                        gpointer      parser_data)
 {
   if (strcmp (tagname, "packing") == 0)
     {

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index acb7f0442503b05e3917c729999a6b17e7a75cb7..0919deae78dd0bb249917ed71ff8e85e55f3d69e 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -447,7 +447,7 @@ gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable,
                                                 GtkBuilder   *builder,
                                                 GObject      *child,
                                                 const gchar  *tagname,
-                                                gpointer     *data)
+                                                gpointer      data)
 {
   /* Just ignore the boolean return from here */
   _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index a63d2ecce3e0c0cc3ffae7648b9f5595fff52279..b7a038e17cbef1175ba07824e4924b0fce6274c3 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -138,7 +138,7 @@ static void     gtk_file_filter_buildable_custom_tag_end       (GtkBuildable  *b
                                                                GtkBuilder    *builder,
                                                                GObject       *child,
                                                                const gchar   *tagname,
-                                                               gpointer      *data);
+                                                               gpointer       data);
 
 G_DEFINE_TYPE_WITH_CODE (GtkFileFilter, gtk_file_filter, G_TYPE_INITIALLY_UNOWNED,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
@@ -366,7 +366,7 @@ gtk_file_filter_buildable_custom_tag_end (GtkBuildable *buildable,
                                           GtkBuilder   *builder,
                                           GObject      *child,
                                           const gchar  *tagname,
-                                          gpointer     *user_data)
+                                          gpointer      user_data)
 {
   if (strcmp (tagname, "mime-types") == 0 ||
       strcmp (tagname, "patterns") == 0)

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 160bd6b2c8e06441669a23000be6135b68d470a5..45f37b347e2b50921a731594bbdd876113943e4e 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -320,7 +320,7 @@ static void     gtk_icon_view_buildable_custom_tag_end   (GtkBuildable  *buildab
                                                          GtkBuilder    *builder,
                                                          GObject       *child,
                                                          const gchar   *tagname,
-                                                         gpointer      *data);
+                                                         gpointer       data);
 
 static guint icon_view_signals[LAST_SIGNAL] = { 0 };
 
@@ -6866,7 +6866,7 @@ gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable,
                                         GtkBuilder   *builder,
                                         GObject      *child,
                                         const gchar  *tagname,
-                                        gpointer     *data)
+                                        gpointer      data)
 {
   if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder,
                                                   child, tagname, data))

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 260623ede181d17a95ea17481c4108df2606fd28..6c4d0de601f8263a31e0a3002c35cb8f76752611 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -293,7 +293,7 @@ static void     gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable
                                                         GtkBuilder   *builder,
                                                         GObject      *child,
                                                         const gchar  *tagname,
-                                                        gpointer     *data);
+                                                        gpointer      data);
 
 G_DEFINE_TYPE_WITH_CODE (GtkListStore, gtk_list_store, G_TYPE_OBJECT,
                          G_ADD_PRIVATE (GtkListStore)
@@ -2626,7 +2626,7 @@ gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable,
                                          GtkBuilder   *builder,
                                          GObject      *child,
                                          const gchar  *tagname,
-                                         gpointer     *parser_data)
+                                         gpointer      parser_data)
 {
   SubParserData *data = (SubParserData*)parser_data;
 

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a4ae3145dde87ff94449d24ce136c2dbf8740021..0d7a3140a15399f804005057de28982f604589e3 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -413,7 +413,7 @@ gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable,
                                     GtkBuilder   *builder,
                                     GObject      *child,
                                     const gchar  *tagname,
-                                    gpointer     *data)
+                                    gpointer      data)
 {
   /* Just ignore the boolean return from here */
   _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);